Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Tue, 20 Mar 2007 11:56:20 +0000 (11:56 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Tue, 20 Mar 2007 11:56:20 +0000 (11:56 +0000)

Trivial merge